List tornado and traitlets as dependencies explicitly, and cleanup unreachable code #457
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
consideRatio
force-pushed
the
pr/declare-deps
branch
from
9ac91e5 to
26b59d8
Compare
consideRatio
changed the title
consideRatio
commented
Feb 23, 2024
Comment on lines
-43
to
-51
| # for tornado 4.5.x compatibility | ||
| if version_info[0] == 4: | ||
| conn = PingableWSClientConnection( | ||
| io_loop=ioloop.IOLoop.current(), | ||
| compression_options={}, | ||
| request=request, | ||
| on_message_callback=on_message_callback, | ||
| on_ping_callback=on_ping_callback, | ||
| ) |
There was a problem hiding this comment.
This is cleaned up now that we know we required tornado 5.0 via jupyter server 1.0.0+.
consideRatio
commented
Feb 23, 2024
Comment on lines
+43
to
+57
| # resolver= parameter requires tornado >= 6.3. Only pass it if needed | ||
| # (for Unix socket support), so older versions of tornado can still | ||
| # work otherwise. | ||
| kwargs = {"resolver": resolver} if resolver else {} | ||
| conn = PingableWSClientConnection( | ||
| request=request, | ||
| compression_options={}, | ||
| on_message_callback=on_message_callback, | ||
| on_ping_callback=on_ping_callback, | ||
| max_message_size=getattr( | ||
| websocket, "_default_max_message_size", 10 * 1024 * 1024 | ||
| ), | ||
| subprotocols=subprotocols, | ||
| **kwargs, | ||
| ) |
There was a problem hiding this comment.
This was just indentation changes by no longer nesting under an else clause.
minrk
approved these changes
Feb 23, 2024
consideRatio
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We reference tornado and traitlets directly from our source code, so we should surface those dependecies.
We require
jupyter-server>=1.0, which depend ontornado>=5.0andtraitlets>=4.2.1, so I'm adding our dependency on tornado and traitlets explicitly in this project, putting their lower bounds to those versions - and adding a test to verify our test suite works against those versions.For reference, note that
jupyter-server==1.1.0released four years ago requires tornado 6.1, so I figure its safe to assume we can bump these notably without issues in the future.This enables me to better reason about #448, as its changing something that is passed to tornado, and tornado's behavior may differ slightly between versions.